AND simple
& simple
conflict fixed
---Feature1
---modified on master
conflict fixed.
fix bugs