deleted posts and added mine
all conflicts resolved