cleaned up branch merges