Resolved build conflicts.