Merged and fixed comflicts