Fixed Conflict Bug, + conflict holder, + start diff button