Cleaned up the merge