cleaning up before deploy
fixing merge conflicts