fixes merging errors