Missed some conflicts merging in development