fixed some minor issues and conflicts