Merge Goalie App V1