in dev modify
modify in master add 5
conflicts fiexed
add 6
merged from remote