updated the door so must commit before i pull new code
must merge before pulling
merge conflicts
merge conflicts