Closing comment too
Resolving conflict