-is3 changes after is3
-issue 3 conflicts removed