fixed for real this time
fixed merge conflicts