Resolve merging issue (I hope)