creat a new branch
AND simple
master add new line
confict fixed