merging conflict compileable and runable