fixes merging error