Committed this file while it was still in conflict. Resolved.