Fixing modman file that contained remnants from git conflict