Resolved Conflict in Library Export Java Source