solved conflict between pro files