changed default prompt to custom prompt
fix pull conflicts