Adrien/megamerge/samed