resolve conflicts
fixing the stuff on live