Finish rail gun
fix conflicts