first commit
conflicts resolved