This was a really strange merge conflict :S Syntax was fucked up, think I fixed it now..
This was a really strange merge conflict :S Syntax was fucked up, think I fixed it now..

Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,Factlink/factlink-core,daukantas/factlink-core,daukantas/factlink-core,Factlink/factlink-core