Edited for a conflict
Solved conflict, merged