You seem to have committed an unresolved merge conflict.