fixing confilcts
deletions2