Fixes merging issues blocking compilation