Handling conflicts
Added start script