lot of things
pull and resolv conflicts