Looks like you had some merge conflicts or something happening here that need to be resolved.