Cleaned up a merge