Resolved weird merge conflict