Fixed all merges