why u checked in conflicts code? Please remove all that and resolve conflicts before u push