Fixed all conflicts