fix merge conflict
fix merge conflict

GiangNguyen94/SeniorFieldProject,GiangNguyen94/SeniorFieldProject,GiangNguyen94/SeniorFieldProject,GiangNguyen94/SeniorFieldProject,GiangNguyen94/SeniorFieldProject