Fixed branch merge