Merge changes back in