Fixed the last merging issuses