initial push
conflicts fixed