Removed left over from merge conflict