Resolved clashes -- marked with ## >>>