Better templates + coding style -> all that + some conflict fix