Double line suppression
Fix screen order
Handle git conflict with a custom script