Hopefully merging correctly