branch feature1: and simple
master branch:& simple
manually merge confilcts