static feedback
resolved conflicts