resolving conflict
resolving commit 2