Merged, solved conflicts