Fixed branch merge issue