Testing Testing merge branches with conflitcs Add conflicts to solve

Testing stashing after pull