Initial commit after conflicts