Fixed issue on automatic merge