issues with merge due to me updating