correct issues
conflicts fixed