resolves merge conflict in leap year program