Fixed branch conflict