Unmerged files to be fixed in next commit