latest compiler updates
solved conflicts