Merge develop commits + resolve conflicts