checking in scoop
fixing merge conflict