Fixes merging mistake