Update create site logic
resolve conflicts