working on 2 way
project 2 working condition
merged conflicts