Merge default user script conflicts