added compilation controller
resolved conflicts